bitkeeper revision 1.1713.3.7 (42b2eca9N1e5S0oGdW8OeKAkL9oDOQ)

netif.py, blkif.py:
  Add exportToDB functions to save evtchn port.
Signed-off-by: Mike Wray <mike.wray@hp.com>
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/tools/python/xen/xend/server/blkif.py b/tools/python/xen/xend/server/blkif.py
index 0b40c30bf3e3c92a3b9f65b10781e174b7eca9f3..59932a3d8b112bd335361d75e5eda8ba2495524b 100755 (executable)
--- a/tools/python/xen/xend/server/blkif.py
+++ b/tools/python/xen/xend/server/blkif.py
@@ -193,6 +193,13 @@ class BlkDev(Dev):
         self.backendId = 0
         self.configure(self.config, recreate=recreate)
 
+    def exportToDB(self, save=False):
+        Dev.exportToDB(self, save=save)
+        backend = self.getBackend()
+        if backend and backend.evtchn:
+            db = self.db.addChild("evtchn")
+            backend.evtchn.exportToDB(db, save=save)
+
     def init(self, recreate=False, reboot=False):
         self.frontendDomain = self.getDomain()
         self.frontendChannel = self.getChannel()

diff --git a/tools/python/xen/xend/server/netif.py b/tools/python/xen/xend/server/netif.py
index 0a498425220249b2efb2ebabaaed503e2d1dee2c..c799c621c1625c0292515b0a53c738b84a01861a 100755 (executable)
--- a/tools/python/xen/xend/server/netif.py
+++ b/tools/python/xen/xend/server/netif.py
@@ -66,11 +66,9 @@ class NetDev(Dev):
         DBVar('be_mac',  ty='mac'),
         DBVar('bridge',  ty='str'),
         DBVar('script',  ty='str'),
-        #DBVar('ipaddr'),
         DBVar('credit',  ty='int'),
         DBVar('period',  ty='int'),
         DBVar('vifname', ty='str'),
-        DBVar('evtchn'),                #todo: export fields (renamed)
         ]
 
     def __init__(self, controller, id, config, recreate=False):
@@ -92,6 +90,12 @@ class NetDev(Dev):
         self.vifname = None
         self.configure(self.config, recreate=recreate)
 
+    def exportToDB(self, save=False):
+        Dev.exportToDB(self, save=save)
+        if self.evtchn:
+            db = self.db.addChild("evtchn")
+            self.evtchn.exportToDB(db, save=save)
+
     def init(self, recreate=False, reboot=False):
         self.destroyed = False
         self.status = NETIF_INTERFACE_STATUS_DISCONNECTED